Auto merge of #4182 - matklad:simplify, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 17 Jun 2017 19:14:50 +0000 (19:14 +0000)
committerbors <bors@rust-lang.org>
Sat, 17 Jun 2017 19:14:50 +0000 (19:14 +0000)
Simplify inferred binary names

Fix for https://github.com/rust-lang/rust/issues/42365, which probably breaks other stuff :(


Trivial merge